Merge remote-tracking branch 'origin/master' into feature/android

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/net/tramp.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/lisp.h
Simple merge